[SPARK-42049][SQL][FOLLOWUP] Always filter away invalid ordering/partitioning #40137
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @peter-toth |
dongjoon-hyun
approved these changes
Feb 23, 2023
peter-toth
reviewed
Feb 23, 2023
| @@ -114,7 +114,11 @@ trait AliasAwareQueryOutputOrdering[T <: QueryPlan[T]] | |||
| } | |||
| }.takeWhile(_.isDefined).flatten.toSeq | |||
| } else { | |||
| orderingExpressions | |||
| // Make sure the returned ordering are valid (only reference output attributes of the current | |||
There was a problem hiding this comment.
Good catch! Thanks for this follow-up!
But, I'm not sure this part is correct as sortOrder.children should be filtered with _.references.subsetOf(outputSet) separately.
E.g. this test (is a bit artifical though) fails now:
test("SPARK-42049: Improve AliasAwareOutputExpression - no alias but still prune expressions 2") {
withSQLConf(SQLConf.OPTIMIZER_EXCLUDED_RULES.key ->
Seq(CollapseProject.ruleName, ColumnPruning.ruleName).mkString(",")) {
val df = spark.range(2).select($"id" as "a", $"id" as "b").select($"a")
val outputOrdering = df.queryExecution.optimizedPlan.outputOrdering
assert(outputOrdering.size == 1)
assert(outputOrdering.head.child.asInstanceOf[Attribute].name == "a")
assert(outputOrdering.head.sameOrderExpressions.size == 0)
}
}
viirya
approved these changes
Feb 23, 2023
|
Hmm, the failed test seems a related one. |
|
Oh is it still failing? |
|
I think it was failing due to latest commit. |
|
The failed test checks invalid ordering and I've updated it. |
dongjoon-hyun
approved these changes
Feb 24, 2023
dongjoon-hyun
pushed a commit
that referenced
this pull request
Feb 24, 2023
…itioning ### What changes were proposed in this pull request? This is a follow-up of #37525 . When the project list has aliases, we go to the `projectExpression` branch which filters away invalid partitioning/ordering that reference non-existing attributes in the current plan node. However, this filtering is missing when the project list has no alias, where we directly return the child partitioning/ordering. This PR fixes it. ### Why are the changes needed? to make sure we always return valid output partitioning/ordering. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? new tests Closes #40137 from cloud-fan/alias. Authored-by: Wenchen Fan <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 72922ad) Signed-off-by: Dongjoon Hyun <[email protected]>
|
Merged to master/3.4. |
snmvaughan
pushed a commit
to snmvaughan/spark
that referenced
this pull request
Jun 20, 2023
…itioning ### What changes were proposed in this pull request? This is a follow-up of apache#37525 . When the project list has aliases, we go to the `projectExpression` branch which filters away invalid partitioning/ordering that reference non-existing attributes in the current plan node. However, this filtering is missing when the project list has no alias, where we directly return the child partitioning/ordering. This PR fixes it. ### Why are the changes needed? to make sure we always return valid output partitioning/ordering. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? new tests Closes apache#40137 from cloud-fan/alias. Authored-by: Wenchen Fan <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 72922ad) Signed-off-by: Dongjoon Hyun <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This is a follow-up of #37525 . When the project list has aliases, we go to the
projectExpressionbranch which filters away invalid partitioning/ordering that reference non-existing attributes in the current plan node. However, this filtering is missing when the project list has no alias, where we directly return the child partitioning/ordering.This PR fixes it.
Why are the changes needed?
to make sure we always return valid output partitioning/ordering.
Does this PR introduce any user-facing change?
no
How was this patch tested?
new tests